core fix..