Minor change to core (v0.1.11)