bug fix related with context null values