This should fix most of the snap issues...