Cloud forms fix