Issue # M-241