Partially address issue #44