Attempted temp workaround for #408