final fix on 12