Corrected 0/1 case from wip branch