#1 - further improving code coverage