Bug fixed and added default value if null