#4507: Fixed