Fixing up a silly bug workaround