Updated as per @bastnic comment