Final modification for regression tests #88