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