This change fixes issue #257