fix previous buggy merge