fixed exceptfor