fix for domain model mapping