cleanup / bugfix