Item12362: Try to optimize it a bit so it is faster