Add an option to solve #598