boolean issue fixed