Hackish way to deal with the sign extension problem
Please don't merge yet, buildings are still in flux