[0.6.4] Fixes #16