Form Logic Fix