Add check for type=time too