Fixed a regression introduced by a recent change