Important Fix and Tweak