Introduced an approach for #123