temporary patch fixes  dropping problems