Addressing #243