Fix #575