few changes for bugfix