Switched order of conditions in figureView