Critical bug corrected