Another patch for issue #273