Fixed rare bug with entries expanding
Fixed #71