Costly Fix

Costly Fix