Fix @context generation