Fix issue #383