Also, a little scenario has been added to have the behavior covered and prevent this to happen again.