Something like this is addressed by 2.05, so it might be fixed now, or at least reduced considerably.