Fixes bug #7