Closed issue #33