Fixed #2280

Fixed #2280