Fixed issue with GenericDao