fixes for #130, 377