Fix race condition
Fix for compile warning as 1.6 doesnt have @SafeVarargs