Also fix #192 in 0.7.x branch

updates #192