master
Fixed core to remove warning