Fixing a bug with the class locations