Mica's fix