fixes for #283