Issue 94 (refix)