fixing none bug