Removed experimental code to avoid null pointer.