Current bug corrected