Attempt to fix the problem with undefined