fixed with property naming in criteria