Rental condo in a 1031 exchange.  Gain is being calculated on 4787 and on to 1040.  Gain should not be recognized but reduce basis in new property.  How do I get rid of the gain.  Should flow to 8824 like kind exchanges in my view.  Need help checking the boxes and with forms.

Virgil