Fix #534