final fix for v1.0