trying to fix location, might break