Issue #11 and references fix