fixed bug of wrong context, refactoring