Fixes Nil issues