fixed some bug with context