With fix to NaN bug in directives