fixed doctrine mappings