(v1.5.2) Fix #5