Signal option fix