v0.3.4: fix issue 22