Bugfix previous commit