Bugfix previous bugfix