Workaround for RightAWS bug.