Proposed Fix for Error

Commiting this to access it on a second computer to test the fix