Fixes #63

Thanks @marco-solare
update for carbon
Andrew's Tuesday Fixes