Addressing #269