final fix for version 1