Fix some weird code for @joelburget