Update on issue #40