Incorporate mysterious patch from si