refix/finetune fix of 1877