Try to fix clockpicker bug v3