Fixed label usage
Fixed boolean mess