Missing changes of issue 80