Improved the previous bugfix a bit