Fixed wrong behavior for checkable buttons