Fixes bug #2