Provided more comments, as a solution for issue #51