v3.3 - last second bugfix