created merge request !17 (merged) to address this issue
mentioned in merge request !17 (merged)
closed with commit 13998972