Fix #525