Fixes #97
reving to 0.10.11