[#1389] Move context option to avoid exception, see issue for details