Trying to iron out a bug