add expand in Environment ( up #391 )