Adding all stuff back in order to reproduce bug.