fix last bits