Issue #76
(cherry picked from commit 2de0ff2)