fixed #1 tests ok