Now handles percentage and fixed points properly