Starting to work on i686 again