Applying comments at #502