Fix to earlier problem