Committed missing piece for Issue #40