SFX & pill origination location fix