Fix for ont server restart