Cleared FIXME that Stephane sent our way