Fixed issue with non-initialized variables