Take a stab a fixing #21