Temp Fix

This is a temp fix untill CML or someone can figure out WTF went on.