Fixed bug in DTOs