- also fixes memory-violation in previous version - refs #414 Original: c528e710e347739bfc85cfd84ccc342159be99a1