handle those better