Added some code to handle fish structures