Issue 37

Find the new patch, hope this time i've done it right.