I don't think modifying that is necessary.  I think your approach is reasonable.