Heavy refactoring in progress => Pick date goes wrong