diff --git a/src/Funge.cpp b/src/Funge.cpp
index af171cc..b290d81 100644
--- a/src/Funge.cpp
+++ b/src/Funge.cpp
@@ -136,12 +136,15 @@ int fungemain(int argc, char **argv, char **envp){
 				std::cerr << "Unsupported standard: " << arg << std::endl;
 				return EINVAL;
 			}
-			if(funge_config.standard == Funge::FUNGE_93
-					|| funge_config.standard == Funge::FUNGE_FISH
-					|| funge_config.standard == Funge::FUNGE_STARFISH){
+			if(funge_config.standard == Funge::FUNGE_93){
 				funge_config.topo = Funge::TOPO_TORUS;
 				funge_config.strings = Funge::STRING_MULTISPACE;
 				funge_config.cells = Funge::CELL_CHAR;
+			}else if(funge_config.standard == Funge::FUNGE_FISH
+					|| funge_config.standard == Funge::FUNGE_STARFISH){
+				funge_config.topo = Funge::TOPO_LAHEY;
+				funge_config.strings = Funge::STRING_MULTISPACE;
+				funge_config.cells = Funge::CELL_INT;
 			}else{
 				funge_config.topo = TOPO_LAHEY;
 				funge_config.strings = STRING_SGML;