Fix per changes by deviantART