fixing some code. related to #null