Bugfix on previous commit, usability improvement