Fixed issues, thanks Jonathan