Hopefully fixed waves getting stuck.