Remote-id support fixed (bug #299)