Rev 125

Bug fix attempt