Fixed #3258

Fixed #3258