test and bugfix