Fix #504 - Moving ge around in expo_base