Addresses issues in 48e4fb456a