diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp
index e62c811f4a..653d471e75 100644
--- a/src/modules/fw_att_control/fw_att_control_main.cpp
+++ b/src/modules/fw_att_control/fw_att_control_main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   Copyright (c) 2013-2015 PX4 Development Team. All rights reserved.
+ *   Copyright (c) 2013-2016 PX4 Development Team. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -376,9 +376,14 @@ FixedwingAttitudeControl::FixedwingAttitudeControl() :
 	_attitude_setpoint_id(0),
 
 	/* performance counters */
-	_loop_perf(perf_alloc(PC_ELAPSED, "fw att control")),
-	_nonfinite_input_perf(perf_alloc(PC_COUNT, "fw att control nonfinite input")),
-	_nonfinite_output_perf(perf_alloc(PC_COUNT, "fw att control nonfinite output")),
+	_loop_perf(perf_alloc(PC_ELAPSED, "fwa_dt")),
+#if 0
+	_nonfinite_input_perf(perf_alloc(PC_COUNT, "fwa_nani")),
+	_nonfinite_output_perf(perf_alloc(PC_COUNT, "fwa_nano")),
+#else
+	_nonfinite_input_perf(nullptr),
+	_nonfinite_output_perf(nullptr),
+#endif
 	/* states */
 	_setpoint_valid(false),
 	_debug(false),