Fix #522