add workaround for the workaround (closes #26)