Use Cases fix