Fix [#335 state:fixed responsible:none]