This may solve #140.