WyCS: Bug fix for problem similar to that in #400