#445 fixes 2