A non-leaky version = )