changes for #133