diff --git a/build.xml b/build.xml
index 9746e46..66e009a 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,7 @@
 
 		<javac destdir="${objDir}"
 			encoding="${srcEncoding}" debug="yes" includeantruntime="no"
-			source="1.6" target="1.6">
+			source="1.8" target="1.8">
 			<src path="${srcDir}"/>
 			<src path="${contribSrcDir}"/>
 		</javac>
@@ -39,7 +39,7 @@
 
 		<javac destdir="${callLoggingObjDir}"
 			encoding="${srcEncoding}" debug="yes" includeantruntime="no"
-			source="1.6" target="1.6">
+			source="1.8" target="1.8">
 			<classpath>
 				<pathelement location="${objDir}"/>
 				<path>
diff --git a/src/com/toshiba/mwcloud/gs/sql/internal/SQLPreparedStatement.java b/src/com/toshiba/mwcloud/gs/sql/internal/SQLPreparedStatement.java
index 2ba215b..2a8dec9 100644
--- a/src/com/toshiba/mwcloud/gs/sql/internal/SQLPreparedStatement.java
+++ b/src/com/toshiba/mwcloud/gs/sql/internal/SQLPreparedStatement.java
@@ -311,7 +311,7 @@ public void setTime(int parameterIndex, Time x, Calendar cal)
 	@Override
 	public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
 			throws SQLException {
-		throw SQLErrorUtils.errorNotSupported();
+        setValue(parameterIndex, x);
 	}
 
 	@Override