Fixed issues with