hopefully fixed ec
merged?