Aaand another tweak