Resolved issue #349