Fixed broken code, should pass travis now.