Fixing local paths problem - attempt #1