diff --git a/format-master.xml b/format-master.xml
index 4d81bdb..efe7a38 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1182,7 +1182,14 @@
 		<latex>Figure~\ref*{<xsl:value-of select="@label"/>}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Figure&amp;#160;</xsl:text>
-			<xsl:number count="figure" level="any" format="1"/>
+			<xsl:choose>
+				<xsl:when test="$showanswers='yes'">
+					<xsl:number count="figure" level="any" format="1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</html>
 	</template>
 	
@@ -1190,7 +1197,14 @@
 		<latex>Table~\ref*{<xsl:value-of select="@label"/>}</latex>
 		<html>
 			<xsl:text disable-output-escaping="yes">Table&amp;#160;</xsl:text>
-			<xsl:number count="table" level="any" format="1"/>
+			<xsl:choose>
+				<xsl:when test="$showanswers='yes'">
+					<xsl:number count="table" level="any" format="1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</html>
 	</template>
 	
@@ -1251,14 +1265,38 @@
 	<template name="figure-caption" match="figure/caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
-			<STRONG>Figure <xsl:number count="figure" level="any" format="1"/>. </STRONG><xsl:apply-templates/>
+			<STRONG>
+				<xsl:text>Figure </xsl:text>
+				<xsl:choose>
+					<xsl:when test="$showanswers='yes'">
+						<xsl:number count="figure" level="any" format="1"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:number count="figure[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text>. </xsl:text>
+			</STRONG>
+			<xsl:apply-templates/>
 		</html>
 	</template>
 	
 	<template name="table-caption" match="table/caption">
 		<latex><xsl:apply-templates/></latex>
 		<html>
-			<STRONG>Table <xsl:number count="table" level="any" format="1"/>. </STRONG><xsl:apply-templates/>
+			<STRONG>
+				<xsl:text>Table </xsl:text>
+				<xsl:choose>
+					<xsl:when test="$showanswers='yes'">
+						<xsl:number count="table" level="any" format="1"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:number count="table[not(ancestor::answer) and not(ancestor::omit) and not(ancestor::comment)]" level="any" format="1"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text>. </xsl:text>
+			</STRONG>
+			<xsl:apply-templates/>
 		</html>
 	</template>
 	
