Issue 463: Changed by following Sergiu's comments.