update core
Fixed #411
Fixed #395