Another bloody cleanup bug (poor initial spec)