Finishes fixing the regression introduced in a1133db3
after the partial fix in b6d6597b.
Signed-off-by: James Almer <jamrial@gmail.com>