Fix for None value