Bugfix previous commits