Apply #94 to everywhere