Major Pug Fix