applied patch
Update public file directory handling