Reverse bugfix