Fix #572