Fix #95

Please notice I needed a branch to do this. Swag.