Issue #398 was implemented