fixes for 1021212