add context and fix path