fixed entity creator