Fixed #3669