Test for PR#498