Resolved issue with estimate / actual calculations