Fixed partially issue #39