Fix #3314