Fixed issues with error 1064