Bug fix on edit stream