Pull: fixing issue #40