solution for issue #43