Fix #349 issue