Issue#498