[0.6.8] Fixes #23 . again.