Last fix improved