Close #144, fix "lag" caused by containers