Fix #535