updated as per issue GOKB:173