fix merged code that was making tests fail