little modification for bugfix