Address 2nd issue raised in #302