FIXED GERONIMO-4594