Fix [#442]