FIX: issue #535 (Regression on getting address in CONTEXT)