Patch update (Credits to marcin1147)