Changes to reproduce bug