This is probably not the right fix, but it is a workaround for now...