Manual fork for icheck 0.9.1