snap bug fixes