fix neobrain's suggestions