Patched issue #17