Fixed for Joel's BS update