fixed null value behaviour