Update fix from #8 comments

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>