diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 38b37a6..ba24396 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -1013,6 +1013,7 @@ glsl_type::std140_base_alignment(bool row_major) const
    if (this->is_array()) {
       if (this->fields.array->is_scalar() ||
 	  this->fields.array->is_vector() ||
+	  this->fields.array->is_sampler() ||
 	  this->fields.array->is_matrix()) {
 	 return MAX2(this->fields.array->std140_base_alignment(row_major), 16);
       } else {