Fast fix for a problem