Final fix

(Probably) the last fix before SDK 2.0, i'll try to switch soon. This one is more of a not-a-bug-but-annoyance fix