Possible fix for errors

Might need to revert this