Workaround a bug that happened during our maps time