Partially solve issue #23