workaround for 37904, 1.1.8