This will get cleaned up - its a work around for a bug I was bumping in to.