Fix #383 issue