Fixes something like #5

This commit shouldn't match their fix-search thing
Merge branch 'bugfix-issue-5'