improve and bugfix