Reverted previous change due to strange errors