Fixed issues, thanks to @weaverryan