Bug fix for pre-final production