Fix #518