Fix commit #670

2017-07-04, agregorcic