Slaughterfish fix

Please review/test/comment/critique...