Fixed recently introduced bug