Implementing previous commit without other changes, probably checked out wrong version :|