Fixed build for entity