fixes #6268 Blank entries creating every time