Getting rid of YOURCXX hack