Try to fix clockpicker bug v2