Fixed production build issue