Follow up on @simong's review