Fix following Michael's comments