Bug sorted...hopefully.