Bug Fix: Attach to Context