Bug #94 workaround