fixed some weird inconsistency with Android and iOS and WP8