Fixed out (7/30)

Fixed out