Bugfix/helper

Related: #3