#31 fixed entry types