crashfix: fixes Whoooa crash

Fixes  #2616