Fix #3367