Small core fix