Fixed entry id being generated when it shouldn't