Fixed issues with hashcode