Fix #109 Based on Luna & Sirius 1.0.0