Issue: Fixes #5