Fix core functionality bug