adding old work around 1.6