FIXME Make this work with flakes