Fix for use cases