Sailfish-37 - Properly billing a sailfish