some logic fixes for check 6b