fixed with statement once again (fixing refactored code) (new tests help ;-))