BASE_PATH fix?