Issue#550

closes #550