Fix GH333
Update changes