Fix #550