Fix knife-solo/issues/278