fixed an issue, all tests so far working