Issue #741 fixed - a==x added in logical switches functions