Try to fix clockpicker bug