fixed context handling for galaxy