Use square_view to avoid square check, instead of new hack

Use square_view to avoid square check, instead of new hack #49