Fix object visibility
merge