Added fix for docker issue #1724