Simplified fix