Unstable
fixes #2