Possible fix
Fix
Cleanup
Possible fix #2
Adjust