fix from akitogo merge