implementation of issue #79
Implementation propose of issue #60