Better fix, per @macbre's comment