final fix for this issue