Added in extra path and credit for @james2doyle