A better fix
Need to be more precise where to insert behavior