Trying to repair #550