Fixed fish stuff - should work