fix crappy core work