[MOD] Change the condition to be shorter. See #426