Fix for C84 Releases