Solves #1816
Solves #1816