fixed #2379
fixed visibility persist
merged