last second bugfix