fixes for #26
fixes for #26