Workaround for META-323