Core: fixed #40 .
Core: fixed #35