fixing the WTF issue