dirty fix to bug #77