beginning of a bugfix