diff --git a/Angle16.h b/Angle16.h
index 410c5f7..d550c54 100644
--- a/Angle16.h
+++ b/Angle16.h
@@ -5,7 +5,7 @@
 
 typedef AngleUsing<signed short> Angle16;
 
-Angle16::AngleUsing(float angle) {
+AngleUsing<signed short>::AngleUsing(float angle) {
   if (!isfinite(angle)) {
     value = 0;
     return;
@@ -15,7 +15,7 @@ Angle16::AngleUsing(float angle) {
   this->value = (signed short)((angle / 360.0F) * 65536.0F);
 }
 
-float Angle16::ToFloat() const {
+float AngleUsing<signed short>::ToFloat() const {
   float f = ((this->value * 180) / 32768.0F);
   return f;
 }
diff --git a/Angle8.h b/Angle8.h
index 2db4d18..4a31500 100644
--- a/Angle8.h
+++ b/Angle8.h
@@ -5,7 +5,7 @@
 
 typedef AngleUsing<signed char> Angle8;
 
-Angle8::AngleUsing(float angle) {
+AngleUsing<signed char>::AngleUsing(float angle) {
   if (!isfinite(angle)) {
     value = 0;
     return;
@@ -16,7 +16,7 @@ Angle8::AngleUsing(float angle) {
   this->value = (signed char)(f * 256.0F);
 }
 
-float Angle8::ToFloat() const {
+float AngleUsing<signed char>::ToFloat() const {
   float f = (this->value * 180) / 128.0F;
   return f;
 }