Initial Fix

first try