Thanks to Warren Emmett for sashimi bug report