Fix bugs in b7cea9bb , ugh.

1 job for master in 4 minutes and 33 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed testing #459

00:04:33