last minute critical bugfix