Fixed bad merge of knockout