Fix for gingerbread