Fix #532