Fixes bug #4