final bugfix monday