Additional fix and update