fixing #3610