Partial fix for incorrectly syncing opted-out

partial fix for issue #19