Fixed Problem 188