minor bugfix
minor bugfixes