Last fix on code