closes: issue #382