Entity Corner case bug fix

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>