Add additional check to prevent snapping to area fills (fixes #1887)