Work around bug