Testing and bugfix