Trying to give an implementation to issue #1.