We hope to improve this in the next update.