Issue#572

resolves #572

concerns #557
concerns #544