criticial bugfix