Fixing logic around saving light object