Fix problem with last change