Fix #507