A try to solve issue #4