Reversed change in Core
Fixed #247