Seems that this is causing issues...