sigh, logic fixes again..