Patch 1

I hope this is the right thing to do ...