Fix for "A Special Surprise"