Fixed type coercion
Reenabled complex math function