clean up - bugfix