Fixed no match bug, created NoneType bug