fixed solution of field after exception
geometry check before solution fixed
changes in modules