Fix #81 File Not Found errors