Fixing seg fault in #380
Merge pull request #2718 from permcody/old_steady_380

Fixing seg fault in #380