PROPPER JOB! (Made it work with 1.7.4)