may partially fix issue#58