fixes, 3.0