Another fix for complex expressions