reopening pull #899 with @kirs edit