diff --git a/src/modules/mc_att_control_vector/mc_att_control_vector_main.cpp b/src/modules/mc_att_control_vector/mc_att_control_vector_main.cpp
index 30c073c293..ef6a46810e 100644
--- a/src/modules/mc_att_control_vector/mc_att_control_vector_main.cpp
+++ b/src/modules/mc_att_control_vector/mc_att_control_vector_main.cpp
@@ -616,12 +616,13 @@ MulticopterAttitudeControl::task_main()
 			math::Vector<3> R_rp_x(R_rp(0, 0), R_rp(1, 0), R_rp(2, 0));
 			e_R(2) = atan2f((R_rp_x % R_sp_x) * R_sp_z, R_rp_x * R_sp_x) * yaw_w;
 
-			if (e_R_z_cos < 0.0) {
+			if (e_R_z_cos < 0.0f) {
 				/* for large thrust vector rotations use another rotation method:
 				 * calculate angle and axis for R -> R_sp rotation directly */
 				q.from_dcm(R.transposed() * R_sp);
 				math::Vector<3> e_R_d = q.imag();
-				float angle_d = 2.0f * atan2f(e_R_d.length(), q(0));
+				e_R_d.normalize();
+				e_R_d *= 2.0f * atan2f(e_R_d.length(), q(0));
 
 				/* use fusion of Z axis based rotation and direct rotation */
 				float direct_w = e_R_z_cos * e_R_z_cos * yaw_w;
diff --git a/src/modules/mc_att_control_vector/mc_att_control_vector_params.c b/src/modules/mc_att_control_vector/mc_att_control_vector_params.c
new file mode 100644
index 0000000000..613d1945b6
--- /dev/null
+++ b/src/modules/mc_att_control_vector/mc_att_control_vector_params.c
@@ -0,0 +1,20 @@
+/*
+ * mc_att_control_vector_params.c
+ *
+ *  Created on: 26.12.2013
+ *      Author: ton
+ */
+
+#include <systemlib/param/param.h>
+
+/* multicopter attitude controller parameters */
+PARAM_DEFINE_FLOAT(MC_YAWPOS_P, 2.0f);
+PARAM_DEFINE_FLOAT(MC_YAWPOS_I, 0.0f);
+PARAM_DEFINE_FLOAT(MC_ATT_P, 6.0f);
+PARAM_DEFINE_FLOAT(MC_ATT_I, 0.0f);
+PARAM_DEFINE_FLOAT(MC_YAWRATE_P, 0.3f);
+PARAM_DEFINE_FLOAT(MC_YAWRATE_D, 0.0f);
+PARAM_DEFINE_FLOAT(MC_YAWRATE_I, 0.0f);
+PARAM_DEFINE_FLOAT(MC_ATTRATE_P, 0.1f);
+PARAM_DEFINE_FLOAT(MC_ATTRATE_D, 0.002f);
+PARAM_DEFINE_FLOAT(MC_ATTRATE_I, 0.0f);
diff --git a/src/modules/mc_att_control_vector/module.mk b/src/modules/mc_att_control_vector/module.mk
index 8d380d719f..de0675df86 100644
--- a/src/modules/mc_att_control_vector/module.mk
+++ b/src/modules/mc_att_control_vector/module.mk
@@ -37,4 +37,5 @@
 
 MODULE_COMMAND	= mc_att_control_vector
 
-SRCS		= mc_att_control_vector_main.cpp
+SRCS		= mc_att_control_vector_main.cpp \
+			  mc_att_control_vector_params.c