#5 and bugfix