Some changes for #184