Fix issue with context.d, JR n