Fixing our bug