Fix #549