Fixed Bug, again