Fixed Rectangle to use the correct origin point