Moved the bold hack to here