Fixed fish initialization