fixes, timeout test
1.4.0