This should fix the subdirectory problem