Initial solution for issue #101