Fixing SR #173