Additional fix to be inline with what APP Engine expects