Possible fix for see more #1220