and a bugfix