Basic fix for gingerbread