Fixing nil bug :)