Fixed Andrew's bug on special case win