Fix #528