Fix issue with overriding the the flash type in layouts