Addressing @wasade's comment