Fix #540 based on Sirius 2.0