fix
let's do it The Right Way