Should solve #2310