Added subdirectory fix