Added workaround for clang version