Fixed unchecked assignments