Fixed #37 - entry fix problem