Implement previous fix correctly