Fixing none issue