Implementation nil fix