Fixes bug #16