Also fixes bug #1