As allways, there was a better way...