Fixed Nil Bug