Update bug fix for #26