Fixes #9! :satisfied: :relieved: