Enhanced previous bugfix