Feature #409 implemented