(cherry picked from commit 2ada84c8)
c7b1ec67 bug corrected
(cherry picked from commit 2ada84c8) c7b1ec67 bug corrected