Attempt to fix effects problems from code