Issue #38

Missing changes