fix exceptions
introduced closed?