Fixes #ISSUE_NUMBER