Fixed issues
Hopeful fix