Make it a little more forgiving