Implementing a bugfix