HAAARSH Fixes #2