old bug + comment fix