Fix for labels bug