HOTFIX - Prevent variable from being not set
HOTFIX - Allow none integer value