file path fix #384 and #386