Fix #536