111 Bugfix previous commit