Construction time&space fix