This fixes bug 21