Swap to proc for obscure reasons