I think i fixed an issue when adding more than two entries (I THINK\)

Maybe this is the right way to solve it?

Related to issue #1