Draft: Bugfix in snapping