Fixing another bug with the class locations