v0.9.2 backport fix

#14 #33