Minor fix if no static directory
Merge