updated changes for #295