Found more bugs