fixes - first stable