Fix [#286]