Follow up work of #106
Follow up work of #106