Issues #43: Fixed reference bug