Fixing issue with bmvm generation.