Fix #533