Fixes #63 ... speechless