Filesystem poor location calls fix