1578 - Space for time substitution

Space for time substitution