Fix bug in whistler