Bug sorted ... hopefully.