Fix for lazy settings