Change structure reference issue #4