critical bug-fix