Fixes bug #1