Fix for public release