Bit more tweaking, after fix