Issue #38 - Solve shape=rect issue