Bugfixing ('None' arguments).