fixing for non-integer expressions