Fixes bug #3