Fixed implementation detail in 2013-06-03