fixed core again