A commit of fixed code. CPU related