Use CURRENT_DIR not APP_DIR