Fixing #640: Problem 4