Reworked to avoid warnings in test-case.