Fixing up to #73