Add unsnap workaround