quick patch for issue #23