Fixed issue (#38)