Fix #10
With Core Module Update