Fixed issue with render context