Somehow the code for this fix wasn't pulled?