"Critical" fix

The most important fix ever :)