Re-instated fix for numeric-comp and defernums