continuing bugfix