improvment and bugfix