fixed nullable variables