rectangle fixes