Fix #576