Map controller fix