Fix of the previous bugfix.