Suggesting core fix