Fix #1044 issue