Fixing bug with not fully defined bean which can't be properly shut down
Table looks like pre-final