Sort:  

Yes, that's exactly the problem with the current setup.

Fingers crossed they do something about it :)