relationship bugs fix