Fix for timzine issue ... ?