Some pixels to fit
Merge branch 'hotfix/finetune'