This is my first contribution, so let me know if I did something wrong. The patch is attatched.