Workaround for floorspace issue