fixes - Part1