Ping Bugfix (II)