(PS3) Improvement on prevous commit