Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23244)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23246)
@@ -178,7 +178,9 @@
 
 	public void setLightChar(String lightChar) {
-		if (SectorIndex == 0)
+		if (SectorIndex == 0) {
 			LightChar = new String[10];
-		LightChar[SectorIndex] = lightChar;
+			LightChar[0] = lightChar;
+		} else if (LightChar[0].isEmpty())
+			LightChar[SectorIndex] = lightChar;
 	}
 
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23244)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23246)
@@ -1074,52 +1074,3 @@
 	}
 
-	public void setLightColour(String str) {
-		int cat = getBuoyIndex();
-
-		if (str == null) {
-			return;
-		}
-
-		switch (cat) {
-		case PORT_HAND:
-		case PREF_PORT_HAND:
-			if (getRegion() == IALA_A) {
-				if (str.equals("red")) { //$NON-NLS-1$
-					setFired(true);
-					super.setLightColour("R"); //$NON-NLS-1$
-				} else {
-					super.setLightColour(""); //$NON-NLS-1$
-				}
-			} else {
-				if (str.equals("green")) { //$NON-NLS-1$
-					setFired(true);
-					super.setLightColour("G"); //$NON-NLS-1$
-				} else {
-					super.setLightColour(""); //$NON-NLS-1$
-				}
-			}
-			break;
-
-		case STARBOARD_HAND:
-		case PREF_STARBOARD_HAND:
-			if (getRegion() == IALA_A) {
-				if (str.equals("green")) { //$NON-NLS-1$
-					setFired(true);
-					super.setLightColour("G"); //$NON-NLS-1$
-				} else {
-					super.setLightColour(""); //$NON-NLS-1$
-				}
-			} else {
-				if (str.equals("red")) { //$NON-NLS-1$
-					setFired(true);
-					super.setLightColour("R"); //$NON-NLS-1$
-				} else {
-					super.setLightColour(""); //$NON-NLS-1$
-				}
-			}
-			break;
-		default:
-		}
-	}
-
 }