Fixes bug #24